From 683eff48dcce30355e76ef5d61fc8da5592acd07 Mon Sep 17 00:00:00 2001 From: Anders Carlsson Date: Mon, 8 Mar 2004 09:40:24 +0000 Subject: [PATCH] Use better icons for home and desktop. 2004-03-08 Anders Carlsson * gtk/gtkfilesystemunix.c: (get_icon_for_directory), (gtk_file_system_unix_render_icon): Use better icons for home and desktop. --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/gtkfilesystemunix.c | 21 ++++++++++++++++++++- 6 files changed, 50 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 03b8fe17cf..58e09fd6b0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2004-03-08 Anders Carlsson + + * gtk/gtkfilesystemunix.c: (get_icon_for_directory), + (gtk_file_system_unix_render_icon): + Use better icons for home and desktop. + 2004-03-08 Anders Carlsson * gtk/gtkfilechooserentry.c: diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 03b8fe17cf..58e09fd6b0 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2004-03-08 Anders Carlsson + + * gtk/gtkfilesystemunix.c: (get_icon_for_directory), + (gtk_file_system_unix_render_icon): + Use better icons for home and desktop. + 2004-03-08 Anders Carlsson * gtk/gtkfilechooserentry.c: diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 03b8fe17cf..58e09fd6b0 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +2004-03-08 Anders Carlsson + + * gtk/gtkfilesystemunix.c: (get_icon_for_directory), + (gtk_file_system_unix_render_icon): + Use better icons for home and desktop. + 2004-03-08 Anders Carlsson * gtk/gtkfilechooserentry.c: diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 03b8fe17cf..58e09fd6b0 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +2004-03-08 Anders Carlsson + + * gtk/gtkfilesystemunix.c: (get_icon_for_directory), + (gtk_file_system_unix_render_icon): + Use better icons for home and desktop. + 2004-03-08 Anders Carlsson * gtk/gtkfilechooserentry.c: diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 03b8fe17cf..58e09fd6b0 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +2004-03-08 Anders Carlsson + + * gtk/gtkfilesystemunix.c: (get_icon_for_directory), + (gtk_file_system_unix_render_icon): + Use better icons for home and desktop. + 2004-03-08 Anders Carlsson * gtk/gtkfilechooserentry.c: diff --git a/gtk/gtkfilesystemunix.c b/gtk/gtkfilesystemunix.c index 88383c4d8c..9f9c9ebb16 100644 --- a/gtk/gtkfilesystemunix.c +++ b/gtk/gtkfilesystemunix.c @@ -824,6 +824,25 @@ gtk_file_system_unix_filename_to_path (GtkFileSystem *file_system, return gtk_file_path_new_dup (filename); } +static const char * +get_icon_for_directory (const char *path) +{ + static char *desktop_path = NULL; + + if (!g_get_home_dir ()) + return "gnome-fs-directory"; + + if (!desktop_path) + desktop_path = g_build_filename (g_get_home_dir (), "Desktop", NULL); + + if (strcmp (g_get_home_dir (), path) == 0) + return "gnome-fs-home"; + else if (strcmp (desktop_path, path) == 0) + return "gnome-fs-desktop"; + else + return "gnome-fs-directory"; +} + static GdkPixbuf * gtk_file_system_unix_render_icon (GtkFileSystem *file_system, const GtkFilePath *path, @@ -862,7 +881,7 @@ gtk_file_system_unix_render_icon (GtkFileSystem *file_system, name = "gnome-fs-chardev"; break; case ICON_DIRECTORY: - name = "gnome-fs-directory"; + name = get_icon_for_directory (filename); break; case ICON_EXECUTABLE: name ="gnome-fs-executable"; -- 2.30.2